From 6eba1da80057e58afde64987e58e8c65f0d6d649 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 9 Nov 2014 12:38:09 -0600 Subject: [PATCH] emacs24-common: conflict with obsolete gnus-bonus-el package Thanks to Hilko Bengen for reporting the problem. Closes: 767949 --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 8adf310845d..199718dd8d6 100644 --- a/debian/control +++ b/debian/control @@ -99,7 +99,7 @@ Package: emacs24-common Architecture: all Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} Suggests: emacs24-el, emacs24-common-non-dfsg -Conflicts: emacs24-el (<< ${Source-Version}), cedet, eieio, speedbar +Conflicts: emacs24-el (<< ${Source-Version}), cedet, eieio, speedbar, gnus-bonus-el Description: GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure diff --git a/debian/control.in b/debian/control.in index 6169897dbeb..266ae90ada0 100644 --- a/debian/control.in +++ b/debian/control.in @@ -99,7 +99,7 @@ Package: @DEB_FLAVOR@-common Architecture: all Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg -Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar +Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar, gnus-bonus-el Description: GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure -- 2.30.2